Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 24 Jun 2010 22:51:08 +0000 (22:51 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 24 Jun 2010 22:51:08 +0000 (22:51 +0000)
commitabfac02b31be0dc183e61229dc798c46f0eab29e
tree132c0ae92bc7f13ec71092a92e0b4be41991e715
parentca618ecc3aefe2d99cb552a9c9d235aa3d6f2d06
parentfd9d3cf3b77e797c5dec9b46ca2ef86f4902b33a
Merge from mainline.